From: Kenichi Handa <handa@m17n.org>
Date: Sun, 31 Jan 2010 06:50:30 +0000 (+0900)
Subject: from trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~8618^2~1
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=a20dc62309dac3a4784634d52e218eab132c9a66;p=emacs.git

from trunk
---

a20dc62309dac3a4784634d52e218eab132c9a66
diff --cc src/ChangeLog
index fa02c0cb93c,b89250cc7ca..843368adc21
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,8 -1,8 +1,13 @@@
 +2010-01-31  Kenichi Handa  <handa@m17n.org>
 +
 +	* font.c (font_parse_xlfd): If FONT is a font-entity and pixel
 +	size in NAME is invalid, return -1.
 +
+ 2010-01-31  Chong Yidong  <cyd@stupidchicken.com>
+ 
+ 	* nsterm.m (ns_defined_color): Block input.  Suggested by Mike
+ 	<deactivated@gmail.com> (Bug#3605).
+ 
  2010-01-31  David De La Harpe Golden  <david@harpegolden.net>
  
  	* fileio.c (Frename_file): Correctly rename symlinks to